merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 31 Jan 2012 11:22:40 +0000 (20:22 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 31 Jan 2012 11:22:40 +0000 (20:22 +0900)
commit1c868a7b619e3fbb8fad08619bc9e65a7a5ee3a5
tree18a6ad4c28b518330911426de9feab5661c0384d
parent29cb07496b169c45a0e2feba8be0682efecafa40
parent27528399fd429b2f510e13f361affb1e2211ceb3
merge trunk